home *** CD-ROM | disk | FTP | other *** search
/ SGI Freeware 2002 November / SGI Freeware 2002 November - Disc 2.iso / dist / fw_gnome-pilot.idb / usr / freeware / src / gnome-pilot / patches.z / patches
Text File  |  2001-10-09  |  9KB  |  290 lines
  1. --- ./conduits/expense/expense_conduit.c    Mon Mar 13 00:14:30 2000
  2. +++ ../gnome-pilot-0.1.54/./conduits/expense/expense_conduit.c    Sun Apr  8 15:44:39 2001
  3. @@ -43,7 +43,9 @@
  4.                                          "$NZ", "NOK", "Pts", "SEK", "CHF", "GBP", "$", "EU" };
  5.  
  6.  /* #define EC_DEBUG */
  7. -#ifdef EC_DEBUG
  8. +#ifndef __GNUC__
  9. +static void LOG(gchar *format,...);
  10. +#elif defined(EC_DEBUG)
  11.  #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
  12.                                     G_LOG_LEVEL_MESSAGE, \
  13.                                     "expense: "##format, ##args)
  14. @@ -141,7 +143,7 @@
  15.  {
  16.          char entry[0xffff];
  17.      
  18. -        const int kDateStrSize = 30;
  19. +#define kDateStrSize    30
  20.          char DateStr[kDateStrSize];
  21.          char *Currency;
  22.  
  23. @@ -330,3 +332,17 @@
  24.          gtk_object_destroy(GTK_OBJECT(c));
  25.  }
  26.  
  27. +
  28. +#ifndef __GNUC__
  29. +static void LOG(gchar *mesg,...)
  30. +{
  31. +#ifdef EC_DEBUG
  32. +    va_list ap;
  33. +    gchar *format = g_strconcat("expense: ", mesg, NULL);
  34. +    va_start(ap,mesg);
  35. +    g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
  36. +    va_end(ap);
  37. +    g_free(format);
  38. +#endif
  39. +}
  40. +#endif
  41. --- ./conduits/email/email_conduit.c    Fri Aug  4 22:02:23 2000
  42. +++ ../gnome-pilot-0.1.54/./conduits/email/email_conduit.c    Sun Apr  8 15:45:38 2001
  43. @@ -23,7 +23,9 @@
  44.  #define CONDUIT_VERSION "0.10"
  45.  
  46.  /*#define EC_DEBUG */
  47. -#ifdef EC_DEBUG
  48. +#ifndef __GNUC__
  49. +static void LOG(gchar *format,...);
  50. +#elif defined(EC_DEBUG)
  51.  #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
  52.                                     G_LOG_LEVEL_MESSAGE, \
  53.                                     "email: "##format, ##args)
  54. @@ -526,3 +528,16 @@
  55.    gtk_object_destroy(GTK_OBJECT(c));
  56.  }
  57.  
  58. +#ifndef __GNUC__
  59. +static void LOG(gchar *mesg,...)
  60. +{
  61. +#ifdef EC_DEBUG
  62. +    va_list ap;
  63. +    gchar *format = g_strconcat("email: ", mesg, NULL);
  64. +    va_start(ap,mesg);
  65. +    g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
  66. +    va_end(ap);
  67. +    g_free(format);
  68. +#endif
  69. +}
  70. +#endif
  71. --- ./conduits/memo_file/memo_file_conduit.c    Sun Aug  6 21:02:17 2000
  72. +++ ../gnome-pilot-0.1.54/./conduits/memo_file/memo_file_conduit.c    Sun Apr  8 15:46:18 2001
  73. @@ -44,7 +44,9 @@
  74.  
  75.  #define MC_DEBUG
  76.  
  77. -#ifdef MC_DEBUG
  78. +#ifndef __GNUC__
  79. +static void LOG(gchar *mesg, ...);
  80. +#elif defined(MC_DEBUG)
  81.  #define LOG(args...) g_log (G_LOG_DOMAIN, \
  82.                              G_LOG_LEVEL_MESSAGE, \
  83.                               "memo_file: "##args)
  84. @@ -1119,3 +1121,16 @@
  85.  }
  86.  
  87.  
  88. +#ifndef __GNUC__
  89. +static void LOG(gchar *mesg,...)
  90. +{
  91. +#ifdef MC_DEBUG
  92. +    va_list ap;
  93. +    gchar *format = g_strconcat("memo_file: ", mesg, NULL);
  94. +    va_start(ap,mesg);
  95. +    g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
  96. +    va_end(ap);
  97. +    g_free(format);
  98. +#endif
  99. +}
  100. +#endif
  101. --- ./utils/Makefile.am    Thu Jul  6 00:58:12 2000
  102. +++ ../gnome-pilot-0.1.54/./utils/Makefile.am    Sun Apr  8 15:46:54 2001
  103. @@ -16,6 +16,7 @@
  104.  gpilotd_client_LDADD = \
  105.      $(top_builddir)/gpilotd/libgpilotd.la \
  106.      $(ORBIT_LIBS) \
  107. +    $(INTLLIBS) \
  108.      $(GNORBA_LIBS)    \
  109.      $(BONOBO_VFS_GNOME_LIBS) \
  110.      $(PISOCK_LIBDIR) $(PISOCK_LIBS)
  111. @@ -24,6 +25,7 @@
  112.  gpilotdcm_client_LDADD = \
  113.      $(top_builddir)/libgpilotdCM/libgpilotdcm.la \
  114.      $(ORBIT_LIBS) \
  115. +    $(INTLLIBS) \
  116.      $(GNORBA_LIBS) \
  117.      $(BONOBO_VFS_GNOME_LIBS) \
  118.      $(top_builddir)/gpilotd/libgpilotdconduit.la \
  119. --- ./utils/Makefile.in    Mon Aug  7 01:22:04 2000
  120. +++ ../gnome-pilot-0.1.54/./utils/Makefile.in    Sun Apr  8 15:47:33 2001
  121. @@ -164,11 +164,11 @@
  122.  
  123.  
  124.  gpilotd_client_SOURCES = gpilotd-client.c
  125. -gpilotd_client_LDADD =      $(top_builddir)/gpilotd/libgpilotd.la     $(ORBIT_LIBS)     $(GNORBA_LIBS)        $(BONOBO_VFS_GNOME_LIBS)     $(PISOCK_LIBDIR) $(PISOCK_LIBS)
  126. +gpilotd_client_LDADD =      $(top_builddir)/gpilotd/libgpilotd.la     $(ORBIT_LIBS)     $(INTLLIBS) $(GNORBA_LIBS)        $(BONOBO_VFS_GNOME_LIBS)     $(PISOCK_LIBDIR) $(PISOCK_LIBS)
  127.  
  128.  
  129.  gpilotdcm_client_SOURCES = gpilotdcm-client.c
  130. -gpilotdcm_client_LDADD =      $(top_builddir)/libgpilotdCM/libgpilotdcm.la     $(ORBIT_LIBS)     $(GNORBA_LIBS)     $(BONOBO_VFS_GNOME_LIBS)     $(top_builddir)/gpilotd/libgpilotdconduit.la     $(PISOCK_LIBDIR) $(PISOCK_LIBS)     $(GNOME_XML_LIB)
  131. +gpilotdcm_client_LDADD =      $(top_builddir)/libgpilotdCM/libgpilotdcm.la     $(ORBIT_LIBS)     $(INTLLIBS) $(GNORBA_LIBS)     $(BONOBO_VFS_GNOME_LIBS)     $(top_builddir)/gpilotd/libgpilotdconduit.la     $(PISOCK_LIBDIR) $(PISOCK_LIBS)     $(GNOME_XML_LIB)
  132.  
  133.  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  134.  CONFIG_HEADER = ../config.h
  135. --- ./gpilotd/queue_io.h    Sun Aug  6 21:02:18 2000
  136. +++ ../gnome-pilot-0.1.54/./gpilotd/queue_io.h    Sun Apr  8 15:48:04 2001
  137. @@ -83,8 +83,10 @@
  138.              guint32 pilot_id;
  139.          } set_userinfo;
  140.          struct {
  141. +            gboolean unused; /* empty structs are illegal */
  142.          } get_userinfo;
  143.          struct {
  144. +            gboolean unused; /* empty structs are illegal */
  145.          } get_sysinfo;
  146.      } parameters;
  147.      
  148. --- ./gpilotd/manager.c    Sun Aug  6 21:02:18 2000
  149. +++ ../gnome-pilot-0.1.54/./gpilotd/manager.c    Sun Apr  8 15:50:21 2001
  150. @@ -476,6 +476,10 @@
  151.                                  req->parameters.restore.directory);
  152.          break;
  153.      default:
  154. +#ifndef __GNUC__
  155. +#undef __PRETTY_FUNCTION__
  156. +#define __PRETTY_FUNCTION__    "install_db_foreach()"
  157. +#endif
  158.          g_warning (_("%s this request.type == %d is not a install/restore"), __PRETTY_FUNCTION__, req->type);
  159.          break;
  160.      }
  161. --- ./gpilotd/orbit_daemon_glue.c    Sun Aug  6 21:02:18 2000
  162. +++ ../gnome-pilot-0.1.54/./gpilotd/orbit_daemon_glue.c    Sun Apr  8 15:51:06 2001
  163. @@ -1529,6 +1529,10 @@
  164.      g_return_if_fail(*req!=NULL);
  165.  
  166.      /* If there is no client to notify, just purge request and return */
  167. +#ifndef __GNUC__
  168. +#undef __PRETTY_FUNCTION__
  169. +#define __PRETTY_FUNCTION__    "orbed_notify_completion()"
  170. +#endif
  171.      if((*req)->client_id==NULL) {
  172.          LOG("%s: no client_id in request",__PRETTY_FUNCTION__);
  173.          gpc_queue_purge_request(req);
  174. @@ -2000,3 +2004,17 @@
  175.     disconnects)
  176.  
  177.  */
  178. +
  179. +#ifndef __GNUC__
  180. +void LOG(gchar *mesg,...)
  181. +{
  182. +#ifdef GPC_DEBUG
  183. +    va_list ap;
  184. +    gchar *format = g_strconcat("gpilotd: ", mesg, NULL);
  185. +    va_start(ap,mesg);
  186. +    g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
  187. +    va_end(ap);
  188. +    g_free(format);
  189. +#endif
  190. +}
  191. +#endif
  192. --- ./gpilotd/orbit_daemon_glue.h    Sun Aug  6 21:02:18 2000
  193. +++ ../gnome-pilot-0.1.54/./gpilotd/orbit_daemon_glue.h    Sun Apr  8 15:51:31 2001
  194. @@ -32,7 +32,9 @@
  195.  #define GPC_DEBUG
  196.  
  197.  /* the LOG macro cannot by used without a format */
  198. -#ifdef GPC_DEBUG
  199. +#if !defined(__GNUC__)
  200. +void LOG(gchar *format,...);
  201. +#elif defined(GPC_DEBUG)
  202.  #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
  203.                                     G_LOG_LEVEL_MESSAGE, \
  204.                                     "gpilotd: "##format, ##args)
  205. --- ./gpilotd/Makefile.am    Thu Jul  6 00:58:11 2000
  206. +++ ../gnome-pilot-0.1.54/./gpilotd/Makefile.am    Sun Apr  8 15:40:08 2001
  207. @@ -115,9 +115,7 @@
  208.      gpilot-structures.h \
  209.      gpilot-userinfo.h
  210.  
  211. -CFLAGS = -Wall -Wmissing-prototypes\
  212. -     -Wmissing-declarations\
  213. -     -Wpointer-arith -g \
  214. +CFLAGS = -g \
  215.      -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
  216.  
  217.  
  218. --- ./gpilotd/Makefile.in    Mon Aug  7 01:21:32 2000
  219. +++ ../gnome-pilot-0.1.54/./gpilotd/Makefile.in    Sun Apr  8 15:40:21 2001
  220. @@ -224,7 +224,7 @@
  221.  gpilotinclude_HEADERS =      gnome-pilot-conduit.h     gnome-pilot.h     gpilotd-app.h     gpilotd-app-dummy-callbacks.h     gpilotd-conduit-mgmt.h     gpilot-structures.h     gpilot-userinfo.h
  222.  
  223.  
  224. -CFLAGS = -Wall -Wmissing-prototypes      -Wmissing-declarations      -Wpointer-arith -g     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
  225. +CFLAGS = -g     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
  226.  
  227.  
  228.  gpilotd_SOURCES =      $(CORBA_SRCLIST)     gpilotd.c        manager.c        manager.h        queue_io.c             queue_io.h        $(GPILOTD_ORB_SRCLIST)         gpilot-structures.c        gpilot-userinfo.c     gpilot-gui.h     gpilot-gui.c
  229. --- ./gpilotd/gpilot-gui.h    Sun Aug  6 21:02:18 2000
  230. +++ ../gnome-pilot-0.1.54/./gpilotd/gpilot-gui.h    Sun Apr  8 15:52:11 2001
  231. @@ -27,8 +27,12 @@
  232.  
  233.  void gpilot_gui_run_dialog(gchar* type,gchar*,...);
  234.  
  235. +#ifdef __GNUC__
  236.  #define gpilot_gui_warning_dialog(format,args...) gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_WARNING,format,##args)
  237. -
  238.  #define gpilot_gui_error_dialog(format,args...) gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_ERROR,format,##args)
  239. +#else
  240. +void gpilot_gui_warning_dialog(gchar *format,...);
  241. +void gpilot_gui_error_dialog(gchar *format,...);
  242. +#endif
  243.  
  244.  #endif /* _GPILOT_GUI_H_ */
  245. --- ./gpilotd/gpilot-gui.c    Sun Aug  6 21:02:18 2000
  246. +++ ../gnome-pilot-0.1.54/./gpilotd/gpilot-gui.c    Sun Apr  8 15:53:02 2001
  247. @@ -49,10 +49,13 @@
  248.      va_end(ap);
  249.  }
  250.  
  251. -/*
  252. +#ifndef __GNUC__
  253.  void 
  254.  gpilot_gui_error_dialog(gchar *mesg,...) {
  255. +    va_list ap;
  256. +    va_start(ap,mesg);
  257.      gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_ERROR,mesg,&ap);
  258. +    va_end(ap);
  259.  }
  260.  
  261.  void 
  262. @@ -62,4 +65,4 @@
  263.      gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_WARNING,mesg,&ap);
  264.      va_end(ap);
  265.  }
  266. -*/
  267. +#endif
  268. --- ./gpilotd/gpilotd.c    Sun Aug  6 21:02:18 2000
  269. +++ ../gnome-pilot-0.1.54/./gpilotd/gpilotd.c    Sun Apr  8 15:54:49 2001
  270. @@ -403,7 +403,7 @@
  271.  static gboolean 
  272.  sync_device (GPilotDevice *device, GPilotContext *context)
  273.  {
  274. -    GPilotPilot *pilot;
  275. +    GPilotPilot *pilot = NULL;
  276.      int pfd;
  277.      int connect_error;
  278.      struct PilotUser pu;
  279. --- ./gpilotd/gnome-pilot-conduit-standard-abs.c    Sun Aug  6 21:02:17 2000
  280. +++ ../gnome-pilot-0.1.54/./gpilotd/gnome-pilot-conduit-standard-abs.c    Sun Apr  8 15:55:48 2001
  281. @@ -824,7 +824,7 @@
  282.      gtk_signal_emit (GTK_OBJECT (conduit),
  283.               pilot_conduit_standard_abs_signals [SET_ARCHIVED],
  284.               local,
  285. -             archived
  286. +             archived,
  287.               &retval);
  288.      return retval;
  289.  }
  290.